Auto merge of #1792 - steveklabnik:gh26482, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 8 Jul 2015 17:35:42 +0000 (17:35 +0000)
committerbors <bors@rust-lang.org>
Wed, 8 Jul 2015 17:35:42 +0000 (17:35 +0000)
In addition, clean up these docs a little.

Addresses part of rust-lang/rust#26482


Trivial merge